version 3

more updates, lots of errors. nothing finalized yet