initial code upload - working, but missing features