Pretty much finished, need timers and cleanup