-fail implemented (tons of stuff left)
Moving some stuff around