More code orginizing. Hoping to finish the bulk of the cleanup tonight so I can get back to work on the important things. EXTREMELY BROKEN DO NOT USE.