3rd commit.
Almost functioning!