3rd commit

pretty much done yo