Let's add some BUGS! Also some partially working code