Cleaned up, it's barebones now!