Added in alignment, fixed up deleting methods.