IT'S ALIVE.

Needs major cleaning tho.
Resolve merge conflict