Base ready, now fix the bugs