omg so bad at commiting, lots of stuff