Ready to add custom post type
Merged alpha branch