A ton of changes. Extracting position function out to module
Adding some missing files