Cleaned up in files, refactored names. Working on getting views to work - getting there slowly.