split Model/Main, started adding Custom