Implemented remaining functionality
Added tmp/ to ignored