Feature complete, needs testing

Also fixed gitignore