Re-organized and fixed all methods...theoretically