major changes to view :) eeep!