buncha shit added - should do more regular commits