working state. Need UI improvements now.