updated a bunch, nearly finished, needs work on loop-time and saving