Core plugin complete!

Moved some stuff around and whatnot