Base Progress

Progress on base code