First Real Commit

Finally works