Yay for complete code re-writes!

Still a lot of stuff to do
Couple bugs to fix
Will add more options soon