Code base complete

- All the pieces done