Develop

- merging some code; no where near ready though