Add basic item screen

Test merge feature branch back in