move classes out of init
change working on show