Removed class based views and now using functions