Reworking some things in custom propel