Making prgress, have the views and controllers working better