Cleanup
Fix parse bugs
Working on building blocks for easy evaluation