initial form
Added new post features
Merged with Albert's branch
More merge conflicts