Commit 2

still a mess