second commit
big changes
Alot of coffescrpt