Assignment complete

Everything works as intended. test files included.