More work on inputs and gui