Version 2

Many things still not working. About to do code cleanup