Updated wip for contest