Adding a lot of stuff that should have been committed seperately