commit 29

did a lot of stuff