Got the parties to align properly, but not finished with that yet