Back to working, still need 15 min timer

Got code reorganized a bit, still need to implement 15 minute timer.
Remember to sync before changing code on any machine!!!