Continued work on console