Polishing front-end and getting new data structures working