restructure
a few fixes and todo items
ignore swp files
simple test script