Finished ontwaken, needs testing