1.6

Rewritten almost everything