Arrived at the next bug-free state

Still lots to implement, though