Fixing lots of bugs and now we are finally ready to skin and add non-essential functionality