Code mostly working - some known issues