Alignments made right.. WIP