Initial commmit with individual pieces working