Commit 19

Improved players, now doesnt work at all. Functions more general.