messed some things up, rolling back a bit ( it's a new framework for me so meh )