Fourth Commit

This is a complete revamp from the last commit.