Fixes

-Finally ready to start on implementing a splitting option for the
player