Merge
Basic prototype of player, only somewhat tested