Total Code Overhaul

Took a different approach .. Looking better but still needs work