A few issues remain that can wait after being merged with master branch