Big commit of first version of working app