Complete rehaul and debug. Should be working now