Inner classes now working