Completely Recoded

Fixed Bugs.