okay i forgot to commit a while. a lot changed.