Finished
Complete new data structure implementation
Cleanup, fixed bugs