The basics are done, ready to merge with master branch