Core Features

Main requirements met, test for bugs