changed some stuff, started on bonus exercise