Nearly everything finished. Adding fancy views now