bad at commiting.. this is the finished project