Sunday afternoon pt.1

Added some more dynamic updating