Cleaned up main class and added libs