Added some work on a cleaner alignment script