Initial commit with basic features working;