Merged work and home

Should make it easier to finish the rest of the problems.