Split into separate files, working on calculations