New files and test

More simple stuff