committing files from RHoK -- hackathon (i.e. needs refactoring)