Added basic class structure stuff