Make this safer
Exacttly like abstract for now - bye bye soon enough